Revert "gpiolib: cdev: add gpio_device locking wrapper around gpio_ioctl()"
This reverts commit c0c4e9767e57b6693f9a99b4e21f043d810f67a7 which is
commit 1d656bd259edb89dc1d9938ec5c5389867088546.
It breaks the build as it depends on a previously reverted change that
had broken the build. It can be brought back in the future in an
abi-safe way if it is really needed.
Bug: 161946584
Change-Id: I09be029b347e25dd34e0f4fc16a6accf409f84cf
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
index f6baaec1..64e3761 100644
--- a/drivers/gpio/gpiolib-cdev.c
+++ b/drivers/gpio/gpiolib-cdev.c
@@ -2123,7 +2123,10 @@
return 0;
}
-static long gpio_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long arg)
+/*
+ * gpio_ioctl() - ioctl handler for the GPIO chardev
+ */
+static long gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
struct gpio_chardev_data *cdev = file->private_data;
struct gpio_device *gdev = cdev->gdev;
@@ -2160,17 +2163,6 @@
}
}
-/*
- * gpio_ioctl() - ioctl handler for the GPIO chardev
- */
-static long gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-{
- struct gpio_chardev_data *cdev = file->private_data;
-
- return call_ioctl_locked(file, cmd, arg, cdev->gdev,
- gpio_ioctl_unlocked);
-}
-
#ifdef CONFIG_COMPAT
static long gpio_ioctl_compat(struct file *file, unsigned int cmd,
unsigned long arg)
